bitkeeper revision 1.798 (4055c7b4y-9JnLpUiv1ACLKPlRrtRQ)

mkbuildtree, Makefile:
  Fix mkbuildtree for Xenolinux.

diff --git a/xenolinux-2.4.25-sparse/arch/xeno/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/Makefile
index c55b190b549e9ee63adba5122ffe3b89fbde6f54..6a1e501b59a3f91fcfed9133142b60b728a1d49f 100644 (file)
--- a/xenolinux-2.4.25-sparse/arch/xeno/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xeno/Makefile
@@ -115,5 +115,5 @@ archmrproper:
 
 archdep:
        rm -f include/asm-xeno/hypervisor-ifs/arch
-       ( cd include/asm-xeno/hypervisor-ifs ; ln -sf arch-$(SUBARCH) arch)
+       ( cd include/asm-xeno/hypervisor-ifs ; rm -rf arch ; ln -sf arch-$(SUBARCH) arch)
        @$(MAKEBOOT) dep

diff --git a/xenolinux-2.4.25-sparse/mkbuildtree b/xenolinux-2.4.25-sparse/mkbuildtree
index a2c048fa97da966c79202bb45f962ff916b06945..1a5182a50b50b1ef99c47b3e3bcbee8751ee27fe 100755 (executable)
--- a/xenolinux-2.4.25-sparse/mkbuildtree
+++ b/xenolinux-2.4.25-sparse/mkbuildtree
@@ -66,7 +66,7 @@ relative_lndir ()
     (
     cd $i
     pref=`echo $i | sed -e 's#/[^/]*#../#g' -e 's#^\.##'`
-    for j in `find . -type f -maxdepth 1`; do
+    for j in `find . -type f -o -type l -maxdepth 1`; do
       ln -sf ${pref}${REAL_DIR}/$i/$j ${SYMLINK_DIR}/$i/$j
     done
     )